From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 23 Mar 2018 15:01:31 +0000 (-0400)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~5813
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8e5ab342aac11ccc54fdcdc9593e989b562f7ae7;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

7c993c34b0 sql.el defcustom fixes
---

8e5ab342aac11ccc54fdcdc9593e989b562f7ae7